Added state-detection to aliases

Currently all aliases are stateful by default, should probably change
that.