Made expressions more generic