Reworked objects to make them a bit more user friendly.