Bug fix and add audit processing