20140925 - Updates to all objects