Changed a few things for backend comfortability