Moved IDs to new class