Added computed properties & default parameters