Add nested interface Lime + Cleanup