Seperated command functions into module