Add features spec and events controller