Added context parameter for different upload contexts