activejdbc-291 #291 Refactoring Model