I'm unsure about this feature. @todb-r7 need your opinion on this please.