Updated to remove duplicate resource definitions