Added full support for Resource type and fix parser for object and callable