modify the procedure in Domain Layer