Improve backend a little