Added proper export of object elements