Updated configuration to register annotation classes if needed #3