Added items missing from the original commit due to issues with eclipse workspaces