Added logging + create_or_update instead of public classes.