Syntax fix
Converted to static classes