Fixxed usertypes, reorganized