adding support for custom objects and accounts