Added basic building fields + initial data