Adding tapster support