Made plugin more better.