Ported some Model methods to XS