Added overloaded functions support