Add boolean to Basic types and correct order of types