Updated code base to reflect usage of an abstracted data layer