Refactor Endorsement model