Links updated
Model binding refactoring, Fixes #179