Added tags kwarg to handler