Adding more FIXME tags, based on http://wiki.wocommunity.org/display/WO/Alternative+Technologies-Cayenne