Migrated to play-2.1.3 and re-wrote models