Moved to POJOs to 'Old_' and constructed new ones