Added option components