Fleshed out object hierarchy