AddGenericClassPostConstruct improvement