Added better error handling and object linking.