Further optimised resource usage