Now has proper container file