Adding more common objects
Small clean-up