New support model and latest unit tests