Added Solution functionality