Some refactoring, added tags