Model refactoring
Added cape (proof of concept)