Refactoring, new entity Url, added more commands, fixed bugs