Added resources injection & minor improvements