Added AppiRate

Also code refactory