Modified table for assignment and moved default mapper-assignment to frontend / recoverd comment for persistence