Moving into a single object for ease of use