20141217 - Updates to all objects