Changed libraries to take optional keywords instead of map.