Adding option to run specific tag + minor refactoring