add more fixes to manage complex objects