Added automoc.