Moved more base urls to java properties