Changed to support compiltaion on 0.6 version