Global code refactoring. Add limitation option