Updated references and using open type m handling