Fix some deprecated call
Allows options to be a callable