Synch between Qi4j and JJs fork..