Added some fields and inproceeding type, did some refactoring