Add extension, new logic, add compatibility hack