Refactor to have single getExtraData method instead of 2