Added controller concept