Fixed classes declaration