More work on types