Refactor command parsing
Custom command to match items