Add support for singular resources