Customer Store procedures refactored