Added rest of types, assigned booleans