Updated to access directly static property