add helper methods, improve Calculated items