FarmLive refactoring