Add support for expression in name attribute