Moved items in Static to static