Refactoring models in more Magento way for 0.3.2 release (Google)