Updates for better building