JCLOUDS-151 - src/main refactored to remove async