0.9.1 support - DEPRECATING