#488 Completed implementation of upload resources