Add default entity and cleanup interface