Added built-in type support. Fixed bugs.