Changed how url patterns are defined to simplify things