Add initial support for complex objects