Moved data and object init out of OAuth check