#510 addition of remaining custom resources