Refactor bulk classes. Add bulk update capability.