Small enhancements, change project to backend