More work on upload module