Updates for better markup