More work on defined variable types