Public API events work, update to include FB to the model