Make resources more generic