Added and adjusted static geometry