Upgrade for pelican 3.5
More updates for pelican 3.5