Added rather experminetal extension mechanizm