Enhancement system rewritten to use the Engineering Table