fraction container complex model refactoring