Added some static stuff