Updated to match new Static syntax