Improved static stuff