Added rules for User and refactored the charts.