added rename support