Feature/unpack only

@gerbercj