Added new class; Some refactoring; Dynamic competitors amount