Migrated old implementations over + new cool classes