Made some methods more consistent with the swift bundle