Move to baseModel where it belongs...