Added initial support for expanders