Add extending to interfaces (cleanup needed)