Improve expression support for few attributes