fixing standalone type and adding system models