Rework entity, add source media information, change configuration variable name