Made small changes to existing classes