Refactor/saving indicator to bundles