merge changes to Resource impl