Add interfaces and basic classes