[FIX] Usage of AtomicObjectFactory