Improve object generator