Brought back the directive processing. Closes #25