Roo changes
Post-roo changes
Refactoring mainly