Added behaviour and type information