Added support for / at the end