Fixed wrong class syntax and added static member variables