Incremental stuffs
Add solor support and integrate aliases