Added functionality for some expressions