Some changes to improve overrides flexibility.
Better logging.