Add interfaces
Fix Merge issues