MSINM-84: Initial create and update functionality