** Merged parent and module projects
** Added instrumentation into persistence build