Fix redunduncy issue in create and update methods for SA and MA