Various updates, added multi version support