Adding more object management code