Added check for request suffix