Add expr form logic