Initial version of generic master