Add preliminary modifier support