Add new config key
Extract entry point from package
Refine models