added more expression functionality