Added Several new classes