TAA-13: Fixed up and refactored database setup service and process