Updated schemes to reflect public/private