Extended with upload functionality