Bug Fix: Properly support @Mapping annotations in internal classes