Ensuring everything is added properly