Optimizing some more in back-end