Added subscription managament, courtesy largely to TobbenTM.