Added partial support to get objects from containers, needs work