Fix support for type='number' and type='integer'

Fix support for type='number' and type='integer', added 'bool' alias for 'boolean' type