Data access refactor

No more static access classes