Change order of default types
Add initial support for common table expressions #486