Added full RestKit mapping