Toast extended with anchor node and some fixes