Added various classes from other projects