Updated Direct implementation to new technology stack