Add Index skeleton + catchup minor changes