Partially refactored key models