Added a struct for easier handling