Added tap availability