Fix contact model to match master