Refactoring and added convolutor