Changed extension, added backcollector, broke assertions and map