Moved to static