add types && rename @__add_type lambda && and refactor