Added support for url parsing and extra checks