Improved teacher model / spec