Partial implementation of new SCAN features