Use correct subject types