Changed object structure to reflect DB