improved architecture
TAP-Support/improved architecture