Extended datalayer and businessobjects

- Updated the joins on existing classes, now using between classes.