Updated to use canonical method