Dev/mixserver

Various changes applied to support model mixing