Added context expansion for independent includes