Mark renaming
Added missing dependency imports