Updates to make the service more functional