Doc-comments update & small AbstractModel refactoring