Improvements on resources