Added support for mapping objects from Custom SQL