content file support added, small refactoring