Lot of changes: updated database model, code refactoring and simplification...