Improve Resources Management