Updated building blocks