Added custom google api url builder

Added small refactorings too