added cluster and position classes