Feature/allow passed functions