Updated version of Tamarin component