Moved accordion from common to base as it is not at all generic anymore