Update based on new conventions