More work on the types definitions