Core adminOption API completed, pending supportive TODO's