Author management

Code structure upgrade with some code generalization.