Added Solution class