Core continued

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>