Added in saving of top entities functionality