Changed classes to accomodate loading from files