Add interfaces support