Should be done with regexp