Added better model typing