XD-489 Add support for Tap Instances

Jira: https://jira.springsource.org/browse/XD-489