Implemented class expanding of @return annotation for non-generated factories