Ok, let's keep them and discuss possible changes/deprecations when we discuss the new ticket later.