Added scaffolding for Taps