Adding apollo resources and fixing duplicate entries (long task).