Add expressions and common builder methods.
Restore base path