diff --git a/src/main/java/com/songoda/epicfarming/commands/CommandBoost.java b/src/main/java/com/songoda/epicfarming/commands/CommandBoost.java
index 06cfab0..7861f8f 100644
--- a/src/main/java/com/songoda/epicfarming/commands/CommandBoost.java
+++ b/src/main/java/com/songoda/epicfarming/commands/CommandBoost.java
@@ -8,9 +8,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 public class CommandBoost extends AbstractCommand {
 
@@ -57,7 +55,18 @@ public class CommandBoost extends AbstractCommand {
     }
 
     @Override
-    protected List<String> onTab(CommandSender commandSender, String... strings) {
+    protected List<String> onTab(CommandSender sender, String... args) {
+        if (args.length == 1) {
+            List<String> players = new ArrayList<>();
+            for (Player player : Bukkit.getOnlinePlayers()) {
+                players.add(player.getName());
+            }
+            return players;
+        } else if (args.length == 2) {
+            return Arrays.asList("1", "2", "3", "4", "5");
+        } else if (args.length == 3) {
+            return Arrays.asList("1m", "1h", "1d");
+        }
         return null;
     }
 
diff --git a/src/main/java/com/songoda/epicfarming/commands/CommandGiveFarmItem.java b/src/main/java/com/songoda/epicfarming/commands/CommandGiveFarmItem.java
index 9f79ca1..0a11b42 100644
--- a/src/main/java/com/songoda/epicfarming/commands/CommandGiveFarmItem.java
+++ b/src/main/java/com/songoda/epicfarming/commands/CommandGiveFarmItem.java
@@ -7,6 +7,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class CommandGiveFarmItem extends AbstractCommand {
@@ -55,7 +57,16 @@ public class CommandGiveFarmItem extends AbstractCommand {
     }
 
     @Override
-    protected List<String> onTab(CommandSender commandSender, String... strings) {
+    protected List<String> onTab(CommandSender sender, String... args) {
+        if (args.length == 1) {
+            List<String> players = new ArrayList<>();
+            for (Player player : Bukkit.getOnlinePlayers()) {
+                players.add(player.getName());
+            }
+            return players;
+        } else if (args.length == 2) {
+            return Arrays.asList("1", "2", "3", "4", "5");
+        }
         return null;
     }