Fixed issue on complexTypes not nesting properly