Switched to static dependencies