Revert "DRY-ing Model methods"

This reverts commit 43b3ccf7355762f687cc5a87c8ce21501d1a1de0.