Added helper methods
Fixed a bug on update count