Added circle and image entities