Add Object support and repeat nest