Class mapping now works!