Related types

I brought back your related types. Also some other changes.