Moved marshaling to built-ins it's own object