I am not sure how wise it is to change public api signature...