Merge branch 'enhanced-interface'