Added behaviour support [incomplete yet]