Fixed #312: added support for group and host properties, backwards compatible