Updated vital files to work with 3.0.11