Prepared modelcard changes. refs #8