Added various models and other things