Added initial cluster class without swap