I don't think public interface will change even if we'll do it so should be OK to have it as is.