Implemented annotation based inclusion API and introduced InclusionResolver