Binary.: 0.5.1 performance tuning

Performance turning is applied at 0.5.1 patch.