Added upload route and view, updated entities