Tags definition
Workable file upload
Small refactoring