added more helper methods and @see tag