Switching to new local variable format. Forming new public interface for it.