Added everything from existing compiler