Servers model interface

This is first set of PRs based on discussion we all had w.r.t servers table spike in #678. Please review this.