Improving type system (WIP)