[FIX] container
[FIX] atomic object factory