Added Tag and Attribute form to UI
Refactoring persistence module