Add further improvements