MRBS development plus adding NAE field to database sync