Updated a few missing lines. And added new class