Update to support Model.method and Model.static