Add cluster functions and classes