Changed functionality of some common function

Improved possibility