Added computed and methods