Removed empty wrapper class