Updated todos and added missing factory calls