Moved implementation container to a seperate file