Additional work done to the backend