Added Tags functionality - Issue #3