Updating to build the correct objects