Also make usable for new instances for now