Issue/16 fix cluster support methods when lazy loading