New interfaces. The beginning of #105 fix