Added in components and encoding for upload