4.0: Better resources integration