Moved expressions to another package