Added category implementation
Fixed merge conflicts