Add a few more directive values. Start moving more common stuff to the abstract.