Updated to define more things