20141215 - Updates to all objects