updated to add swift container