Added NonCompliance tables

Added NonCompliance tables and removed AVS