Moved implementation to solo platform