Adding getter improvements