Added remaining beans, fixed upload message