Fixed/added few classes