More work on Types