Add support for both 'psalm' and 'psalms'