Reorganize code + Add support to pre-defined contents