moved constants, added "dump" component