Now can handle assets