Added new field for url, and maked some refactoring (Service object ... )