Setup bases files for tags
Set all method for tags
Merge branch 'feature/tags' into develop