Updated to use new objects