Additional macros and cleanup for cloning