Updated with PySPED latest changes