Added native clusters support