Add support for custom expressions