Added commands and aditional fields