Adding more fields and support multiple inline/external complexSubjects