[CORE][!] Set return type if it is generic

[EDIT][!] If you change the return type it will update the return properties