Adding more LSP functionality