Fixed Custom Upload related features