Created two new classes