Added various features