* Start adding optimization * Add temp fix for protobuf issue * Fix compile errors * Fix protobuf import