Updated config
Updated tags and rules