Added support for source expression and convert semantics