Changed code to make sure of newly available types