Move url generation to storage