Added Reference and Master entities