added more wrapped classes