Merged with new FreeDOM conventions