Added some static keywords