Environment is now optional
Better docs