Removed useless ID logic in states and created my own abstract class
Merge remote-tracking branch 'origin/master'