Add basic types and draw function