PLA-1305 model refactoring