Added nicer ways to compose state