Added a bunch of tiny types and acceleration