Reference states directly in Components

Fix #31