Added various things