Added domen and tree support