fixed warnings
Added classes