Added more static stuff