Changed return type and docs