API extended, documentation improved