Removed Lists from Beans, using methods instead