Closes #183
Added audit trail support