Added FIXMEs & removed unimplementable boolean parsing (for rest-dlf)