Add interfaces and main class