Moved expression to class