Completed type definitions