Compacted diagram, added features