added support for calculated members.