Refactored customers model