Working on:
1. Composable modifications
2. Better API