Beta version of new diagram package