added ability to save basic entities