Add types and interfaces