NSObject+State category has been added + important improvements.