Refactor and add support for ?since parameter