Added experimental standalone class