Adding parszal, code refactoring account