Added cover class and working on renamer