Adding links support in model and controller