Add support for STOP
Support recursive defines and local_defines