Added some support for computed properties