Remove yaml parsing+add url support