Updating starter framework according to recent lessons