Added skipFields option