Added generic Expressions to prototype