Moved added datatype def out of comments