Improvements on backend