4.0: Resources final changes